Set the label of a button if it has no child. (#315253, John Finlay)

2005-09-05  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkaction.c (connect_proxy): Set the label of a button
	if it has no child.  (#315253, John Finlay)

diff --git a/ChangeLog b/ChangeLog
index 06bfd51be2b65ad72cdc0da77b0b8ffd36cab470..b7feeca281f9bb44f3b33f6692afd9cb0850281b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-05  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkaction.c (connect_proxy): Set the label of a button
+       if it has no child.  (#315253, John Finlay)
+
 2005-09-02  Matthias Clasen  <mclasen@redhat.com>
 
        * gtkimcontextsimple.h: Add a modifiers_dropped bit

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 06bfd51be2b65ad72cdc0da77b0b8ffd36cab470..b7feeca281f9bb44f3b33f6692afd9cb0850281b 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-09-05  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkaction.c (connect_proxy): Set the label of a button
+       if it has no child.  (#315253, John Finlay)
+
 2005-09-02  Matthias Clasen  <mclasen@redhat.com>
 
        * gtkimcontextsimple.h: Add a modifiers_dropped bit

diff --git a/gtk/gtkaction.c b/gtk/gtkaction.c
index d462c8c0247ef993b9363b8d998ce26205ac9d13..06e229c8e204f44ef16a405a9f2f45fc7e3fffbd 100644 (file)
--- a/gtk/gtkaction.c
+++ b/gtk/gtkaction.c
@@ -955,7 +955,8 @@ connect_proxy (GtkAction     *action,
                                   G_CALLBACK (gtk_action_sync_button_stock_id),
                                   proxy, 0);
        }
-      else if (GTK_IS_LABEL(GTK_BIN(proxy)->child))
+      else if (GTK_BIN (proxy)->child == NULL || 
+              GTK_IS_LABEL (GTK_BIN (proxy)->child))
        {
          /* synchronise the label */
          g_object_set (proxy,